merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Mar 2006 15:54:58 +0000 (08:54 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 28 Mar 2006 15:54:58 +0000 (08:54 -0700)

Trivial merge